From a8b06ad56103ca7496971abaaeb4f5d85e7c33ed Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 23 Jan 2009 00:54:52 +0000 Subject: [PATCH] Comments for translators on the file chooser entry's completion feedback (start_explicit_completion): Add comments for translators, to explain the purpose of the various feedback messages used during completion. Signed-off-by: Federico Mena Quintero svn path=/trunk/; revision=22183 --- ChangeLog | 9 ++++++--- gtk/gtkfilechooserentry.c | 31 ++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index c95cc751ca..0b4071e2b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,9 +26,9 @@ We filter out incomplete hostnames here (typing "sftp://incompl[tab]" will error out), as well as completely unparsable input. - (start_explicit_completion): Process the result from - refresh...(). Here we present the actual feedback about only - being able to display local folders for local_only=TRUE. + (start_explicit_completion): Process the result from refresh...(). + Here we present the actual feedback about only being able to + display local folders for local_only=TRUE. (commit_completion_and_refresh): Don't do anything with the result of refresh...(), since this function doesn't get called during completion-related interaction. @@ -110,6 +110,9 @@ (refresh_current_folder_and_file_part): Pass on errors from reload_current_folder(). At the very end, assert the invariant described above. + (start_explicit_completion): Add comments for translators, to + explain the purpose of the various feedback messages used during + completion. 2009-01-21 Federico Mena Quintero diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index f8ebfcd3f6..68d0624b25 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -1135,18 +1135,14 @@ start_explicit_completion (GtkFileChooserEntry *chooser_entry) case REFRESH_OK: g_assert (chooser_entry->current_folder_file != NULL); - if (chooser_entry->current_folder - && _gtk_folder_is_finished_loading (chooser_entry->current_folder)) - { - explicitly_complete (chooser_entry); - } + if (chooser_entry->current_folder && _gtk_folder_is_finished_loading (chooser_entry->current_folder)) + explicitly_complete (chooser_entry); else { chooser_entry->load_complete_action = LOAD_COMPLETE_EXPLICIT_COMPLETION; - /* translators: this text is shown while the system is searching - * for possible completions for text in a file chooser entry - */ + /* Translators: this text is shown while the system is searching + * for possible completions for filenames in a file chooser entry. */ pop_up_completion_feedback (chooser_entry, _("Completing...")); } @@ -1154,6 +1150,8 @@ start_explicit_completion (GtkFileChooserEntry *chooser_entry) case REFRESH_INVALID_INPUT: is_error = TRUE; + /* Translators: this is shown in the feedback for Tab-completion in a file + * chooser's text entry, when the user enters an invalid path. */ feedback_msg = _("Invalid path"); break; @@ -1161,10 +1159,21 @@ start_explicit_completion (GtkFileChooserEntry *chooser_entry) is_error = TRUE; if (chooser_entry->local_only) - feedback_msg = _("Only local files may be selected"); /* hostnames in a local_only file chooser? user error */ + { + /* hostnames in a local_only file chooser? user error */ + + /* Translators: this is shown in the feedback for Tab-completion in a + * file chooser's text entry when the user enters something like + * "sftp://blahblah" in an app that only supports local filenames. */ + feedback_msg = _("Only local files may be selected"); + } else { /* Another option is to complete the hostname based on the remote volumes that are mounted */ + + /* Translators: this is shown in the feedback for Tab-completion in a + * file chooser's text entry when the user hasn't entered the first '/' + * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]") */ feedback_msg = _("Incomplete hostname; end it with '/'"); } @@ -1172,6 +1181,10 @@ start_explicit_completion (GtkFileChooserEntry *chooser_entry) case REFRESH_NONEXISTENT: is_error = TRUE; + + /* Translators: this is shown in the feedback for Tab-completion in a file + * chooser's text entry when the user enters a path that does not exist + * and then hits Tab */ feedback_msg = _("Path does not exist"); break; -- 2.30.2